Fix some assignments involving booleans. (#346467, Christian Persch)

2006-07-05  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkwindow.c (gtk_window_unmap, gtk_window_set_keep_above)
	(gtk_window_set_keep_below): Fix some assignments involving
	booleans.  (#346467, Christian Persch)

diff --git a/ChangeLog b/ChangeLog
index d50e3bac6f316cf7d6b6cd828d9bbf912af1d9ab..3938809d0926de57ac7a324ee891733cd958af1b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-05  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_unmap, gtk_window_set_keep_above) 
+       (gtk_window_set_keep_below): Fix some assignments involving
+       booleans.  (#346467, Christian Persch)
+
 2006-07-03  Matthias Clasen <mclasen@redhat.com>
 
        * gtk/gtkgamma.c: Use serialized pixbufs instead of xpms.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d50e3bac6f316cf7d6b6cd828d9bbf912af1d9ab..3938809d0926de57ac7a324ee891733cd958af1b 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2006-07-05  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_unmap, gtk_window_set_keep_above) 
+       (gtk_window_set_keep_below): Fix some assignments involving
+       booleans.  (#346467, Christian Persch)
+
 2006-07-03  Matthias Clasen <mclasen@redhat.com>
 
        * gtk/gtkgamma.c: Use serialized pixbufs instead of xpms.

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 5cbd90fd5967c5f77ef30912cada58cbc08ee0ea..b8a7c502c5ce21d9e4bd4accc8f0e1f2297fab1b 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -4208,11 +4208,11 @@ gtk_window_unmap (GtkWidget *widget)
     }
 
   state = gdk_window_get_state (widget->window);
-  window->iconify_initially = state & GDK_WINDOW_STATE_ICONIFIED;
-  window->maximize_initially = state & GDK_WINDOW_STATE_MAXIMIZED;
-  window->stick_initially = state & GDK_WINDOW_STATE_STICKY;
-  priv->above_initially = state & GDK_WINDOW_STATE_ABOVE;
-  priv->below_initially = state & GDK_WINDOW_STATE_BELOW;
+  window->iconify_initially = (state & GDK_WINDOW_STATE_ICONIFIED) != 0;
+  window->maximize_initially = (state & GDK_WINDOW_STATE_MAXIMIZED) != 0;
+  window->stick_initially = (state & GDK_WINDOW_STATE_STICKY) != 0;
+  priv->above_initially = (state & GDK_WINDOW_STATE_ABOVE) != 0;
+  priv->below_initially = (state & GDK_WINDOW_STATE_BELOW) != 0;
 }
 
 static void
@@ -6597,7 +6597,7 @@ gtk_window_set_keep_above (GtkWindow *window,
   widget = GTK_WIDGET (window);
   priv = GTK_WINDOW_GET_PRIVATE (window);
 
-  priv->above_initially = setting;
+  priv->above_initially = setting != FALSE;
   if (setting)
     priv->below_initially = FALSE;
 
@@ -6651,7 +6651,7 @@ gtk_window_set_keep_below (GtkWindow *window,
   widget = GTK_WIDGET (window);
   priv = GTK_WINDOW_GET_PRIVATE (window);
 
-  priv->below_initially = setting;
+  priv->below_initially = setting != FALSE;
   if (setting)
     priv->above_initially = FALSE;